From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Mon, 21 Mar 2011 00:49:40 +0000 (-0400)
Subject: StThemeNode: support border-image: none
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8581
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=adbc1d97a0f64fcc309336e06d095db8fc02d113;p=gnome-shell.git

StThemeNode: support border-image: none

Treat border-image: none as a valid specification that overwrites any
previously specified border image.

https://bugzilla.gnome.org/show_bug.cgi?id=644788
---

diff --git a/src/st/st-theme-node.c b/src/st/st-theme-node.c
index 2a857ab58..7adfd1342 100644
--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@@ -2518,6 +2518,15 @@ st_theme_node_get_border_image (StThemeNode *node)
 
           char *filename;
 
+          /* Support border-image: none; to suppress a previously specified border image */
+          if (term_is_none (term))
+            {
+              if (term->next == NULL)
+                return NULL;
+              else
+                goto next_property;
+            }
+
           /* First term must be the URL to the image */
           if (term->type != TERM_URI)
             goto next_property;